From fc7d26860a8b252f2d95e40366d2beaa7020b9d4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 6 Sep 2013 09:42:01 -0400 Subject: [PATCH] Fix config dir <> data dir confusion We added code to look for settings.ini in system config dirs, and then proceeded to move it to /usr/share/gtk-3.0 :-(. So, look in that location as well. --- gtk/gtksettings.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 700d1acfbe..4eec096ba4 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -313,6 +313,11 @@ gtk_settings_init (GtkSettings *settings) } g_free (pspecs); + path = g_build_filename (_gtk_get_data_prefix (), "share", "gtk-3.0", "settings.ini", NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS)) + gtk_settings_load_from_key_file (settings, path, GTK_SETTINGS_SOURCE_DEFAULT); + g_free (path); + path = g_build_filename (_gtk_get_sysconfdir (), "gtk-3.0", "settings.ini", NULL); if (g_file_test (path, G_FILE_TEST_EXISTS)) gtk_settings_load_from_key_file (settings, path, GTK_SETTINGS_SOURCE_DEFAULT); -- 2.30.2